Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Fri, 17 Mar 2017 19:24:52 +0000 (21:24 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 17 Mar 2017 19:24:52 +0000 (21:24 +0200)
commit3139914f51615f169f54887123d9d5308095ab49
treefd1d8034d819c60cd67e6c4c1804e306d8e45cd8
parentd2458e5f1c003a85eb2de70ecb08d8951d5a3c3e
parentde9e1724a34a5ed7995655591e02816f70d19885
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs